Autogenerated HTML docs for v2.4.1-314-g9532e
diff --git a/RelNotes/2.5.0.txt b/RelNotes/2.5.0.txt index fb7aa97..b102837 100644 --- a/RelNotes/2.5.0.txt +++ b/RelNotes/2.5.0.txt
@@ -53,6 +53,34 @@ test scripts is now turned on by default. (merge 92b269f jk/test-chain-lint later to maint). + * Filter scripts were run with SIGPIPE disabled on the Git side, + expecting that they may not read what Git feeds them to filter. + We however treated a filter that does not read its input fully + before exiting as an error. + + This changes semantics, but arguably in a good way. If a filter + can produce its output without consuming its input using whatever + magic, we now let it do so, instead of diagnosing it as a + programming error. + + * Instead of dying immediately upon failing to obtain a lock, the + locking (of refs etc) retries after a short while with backoff. + + * Introduce http.<url>.SSLCipherList configuration variable to tweak + the list of cipher suite to be used with libcURL when talking with + https:// sites. + + * "git subtree" script (in contrib/) used "echo -n" to produce + progress messages in a non-portable way. + + * "git subtree" script (in contrib/) does not have --squash option + when pushing, but the documentation and help text pretended as if + it did. + + * The Git subcommand completion (in contrib/) listed credential + helpers among candidates, which is not something the end user would + invoke interatively. + Performance, Internal Implementation, Development Support etc. @@ -96,6 +124,11 @@ is sent to the background instead. (merge 9a9a41d lm/squelch-bg-progress later to maint). + * There was a dead code that used to handle "git pull --tags" and + show special-cased error message, which was made irrelevant when + the semantics of the option changed back in Git 1.9 days. + (merge 19d122b pt/pull-tags-error-diag later to maint). + Also contains various documentation updates and code clean-ups. @@ -107,6 +140,14 @@ track are contained in this release (see the maintenance releases' notes for details). + * Git 2.4 broke setting verbosity and progress levels on "git clone" + with native transports. + (merge 822f0c4 mh/clone-verbosity-fix later to maint). + + * "git add -e" did not allow the user to abort the operation by + killing the editor. + (merge cb64800 jk/add-e-kill-editor later to maint). + * Memory usage of "git index-pack" has been trimmed by tens of per-cent. (merge c6458e6 nd/slim-index-pack-memory-usage later to maint). @@ -236,6 +277,37 @@ files yet to be added to the index. (merge d95d728 nd/diff-i-t-a later to maint). + * There was a commented-out (instead of being marked to expect + failure) test that documented a breakage that was fixed since the + test was written; turn it into a proper test. + (merge 66d2e04 sb/t1020-cleanup later to maint). + + * The "log --decorate" enhancement in Git 2.4 that shows the commit + at the tip of the current branch e.g. "HEAD -> master", did not + work with --decorate=full. + (merge 429ad20 mg/log-decorate-HEAD later to maint). + + * The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is + removed at the same time as 'refs/heads/xyzzy' is added (or vice + versa) very well. + (merge c628edf mh/ref-directory-file later to maint). + + * Multi-ref transaction support we merged a few releases ago + unnecessarily kept many file descriptors open, risking to fail with + resource exhaustion. This is for 2.4.x track. + (merge 185ce3a mh/write-refs-sooner-2.4 later to maint). + + * "git bundle verify" did not diagnose extra parameters on the + command line. + (merge 7886cfa ps/bundle-verify-arg later to maint). + + * Various documentation mark-up fixes to make the output more + consistent in general and also make AsciiDoctor (an alternative + formatter) happier. + (merge d0258b9 jk/asciidoc-markup-fix later to maint). + (merge ad3967a jk/stripspace-asciidoctor-fix later to maint). + (merge 975e382 ja/tutorial-asciidoctor-fix later to maint). + * Code cleanups and documentation updates. (merge 0269f96 mm/usage-log-l-can-take-regex later to maint). (merge 64f2589 nd/t1509-chroot-test later to maint). @@ -245,3 +317,6 @@ (merge 1154aa4 jc/plug-fmt-merge-msg-leak later to maint). (merge 319b678 jk/sha1-file-reduce-useless-warnings later to maint). (merge 9a35c14 fg/document-commit-message-stripping later to maint). + (merge bbf431c ps/doc-packfile-vs-pack-file later to maint). + (merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint). + (merge ccd593c dl/branch-error-message later to maint).
diff --git a/config.txt b/config.txt index 948b8b0..0f668bb 100644 --- a/config.txt +++ b/config.txt
@@ -624,6 +624,12 @@ If set to "auto", `git-commit` would select a character that is not the beginning character of any line in existing commit messages. +core.packedRefsTimeout:: + The length of time, in milliseconds, to retry when trying to + lock the `packed-refs` file. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 1000 (i.e., + retry for 1 second). + sequence.editor:: Text editor used by `git rebase -i` for editing the rebase instruction file. The value is meant to be interpreted by the shell when it is used. @@ -1569,6 +1575,19 @@ If set, store cookies received during requests to the file specified by http.cookieFile. Has no effect if http.cookieFile is unset. +http.sslCipherList:: + A list of SSL ciphers to use when negotiating an SSL connection. + The available ciphers depend on whether libcurl was built against + NSS or OpenSSL and the particular configuration of the crypto + library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST' + option; see the libcurl documentation for more details on the format + of this list. ++ +Can be overridden by the 'GIT_SSL_CIPHER_LIST' environment variable. +To force git to use libcurl's default cipher list and ignore any +explicit http.sslCipherList option, set 'GIT_SSL_CIPHER_LIST' to the +empty string. + http.sslVerify:: Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment @@ -2279,18 +2298,18 @@ remote.<name>.receivepack:: The default program to execute on the remote side when pushing. See - option \--receive-pack of linkgit:git-push[1]. + option --receive-pack of linkgit:git-push[1]. remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See - option \--upload-pack of linkgit:git-fetch-pack[1]. + option --upload-pack of linkgit:git-fetch-pack[1]. remote.<name>.tagOpt:: - Setting this value to \--no-tags disables automatic tag following when - fetching from remote <name>. Setting it to \--tags will fetch every + Setting this value to --no-tags disables automatic tag following when + fetching from remote <name>. Setting it to --tags will fetch every tag from remote <name>, even if they are not reachable from remote branch heads. Passing these flags directly to linkgit:git-fetch[1] can - override this setting. See options \--tags and \--no-tags of + override this setting. See options --tags and --no-tags of linkgit:git-fetch[1]. remote.<name>.vcs::
diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt index 843a20b..bcf54da 100644 --- a/diff-generate-patch.txt +++ b/diff-generate-patch.txt
@@ -77,7 +77,7 @@ Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or -linkgit:git-show[1]. Note also that you can give the `-m' option to any +linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge.
diff --git a/diff-options.txt b/diff-options.txt index ccd4998..b7c3afe 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -23,7 +23,9 @@ -u:: --patch:: Generate patch (see section on generating patches). - {git-diff? This is the default.} +ifdef::git-diff[] + This is the default. +endif::git-diff[] endif::git-format-patch[] -s:: @@ -42,7 +44,9 @@ ifndef::git-format-patch[] --raw:: Generate the raw format. - {git-diff-core? This is the default.} +ifdef::git-diff-core[] + This is the default. +endif::git-diff-core[] endif::git-format-patch[] ifndef::git-format-patch[] diff --git a/git-add.html b/git-add.html index 922a1f4..924871f 100644 --- a/git-add.html +++ b/git-add.html
@@ -874,7 +874,10 @@ See “Interactive mode” for details.</p></div> </dd> <dt class="hdlist1"> --e, --edit +-e +</dt> +<dt class="hdlist1"> +--edit </dt> <dd> <p> @@ -1319,7 +1322,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-03-23 14:31:16 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index f2eb907..fe5282f 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -93,7 +93,8 @@ initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details. --e, \--edit:: +-e:: +--edit:: Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index.
diff --git a/git-config.html b/git-config.html index 5fea612..1bff922 100644 --- a/git-config.html +++ b/git-config.html
@@ -2197,6 +2197,17 @@ the beginning character of any line in existing commit messages.</p></div> </dd> <dt class="hdlist1"> +core.packedRefsTimeout +</dt> +<dd> +<p> + The length of time, in milliseconds, to retry when trying to + lock the <code>packed-refs</code> file. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 1000 (i.e., + retry for 1 second). +</p> +</dd> +<dt class="hdlist1"> sequence.editor </dt> <dd> @@ -4440,6 +4451,23 @@ </p> </dd> <dt class="hdlist1"> +http.sslCipherList +</dt> +<dd> +<p> + A list of SSL ciphers to use when negotiating an SSL connection. + The available ciphers depend on whether libcurl was built against + NSS or OpenSSL and the particular configuration of the crypto + library in use. Internally this sets the <em>CURLOPT_SSL_CIPHER_LIST</em> + option; see the libcurl documentation for more details on the format + of this list. +</p> +<div class="paragraph"><p>Can be overridden by the <em>GIT_SSL_CIPHER_LIST</em> environment variable. +To force git to use libcurl’s default cipher list and ignore any +explicit http.sslCipherList option, set <em>GIT_SSL_CIPHER_LIST</em> to the +empty string.</p></div> +</dd> +<dt class="hdlist1"> http.sslVerify </dt> <dd>
diff --git a/git-diff-files.html b/git-diff-files.html index c6747dd..cea361a 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -778,7 +778,6 @@ <dd> <p> Generate patch (see section on generating patches). - </p> </dd> <dt class="hdlist1"> @@ -812,7 +811,7 @@ <dd> <p> Generate the raw format. - This is the default. + This is the default. </p> </dd> <dt class="hdlist1"> @@ -2002,10 +2001,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
diff --git a/git-diff-index.html b/git-diff-index.html index a16e188..0badfd8 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -779,7 +779,6 @@ <dd> <p> Generate patch (see section on generating patches). - </p> </dd> <dt class="hdlist1"> @@ -813,7 +812,7 @@ <dd> <p> Generate the raw format. - This is the default. + This is the default. </p> </dd> <dt class="hdlist1"> @@ -1986,10 +1985,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
diff --git a/git-diff-tree.html b/git-diff-tree.html index 194ae7b..15c0b87 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -780,7 +780,6 @@ <dd> <p> Generate patch (see section on generating patches). - </p> </dd> <dt class="hdlist1"> @@ -814,7 +813,7 @@ <dd> <p> Generate the raw format. - This is the default. + This is the default. </p> </dd> <dt class="hdlist1"> @@ -2798,10 +2797,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
diff --git a/git-diff.html b/git-diff.html index c7f5508..a8d3430 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -886,7 +886,7 @@ <dd> <p> Generate patch (see section on generating patches). - This is the default. + This is the default. </p> </dd> <dt class="hdlist1"> @@ -920,7 +920,6 @@ <dd> <p> Generate the raw format. - </p> </dd> <dt class="hdlist1"> @@ -2079,10 +2078,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
diff --git a/git-fast-export.txt b/git-fast-export.txt index 929e496..ed57c68 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt
@@ -67,17 +67,17 @@ have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to - \--import-marks. + --import-marks. The file will not be written if no new object has been marked/exported. --import-marks=<file>:: Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and - must use the same format as produced by \--export-marks. + must use the same format as produced by --export-marks. + Any commits that have already been marked will not be exported again. -If the backend uses a similar \--import-marks file, this allows for +If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs.
diff --git a/git-fast-import.txt b/git-fast-import.txt index 690fed3..fd32895 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -42,13 +42,13 @@ --quiet:: Disable all non-fatal output, making fast-import silent when it is successful. This option disables the output shown by - \--stats. + --stats. --stats:: Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with \--quiet. + is currently the default, but can be disabled with --quiet. Options for Frontends ~~~~~~~~~~~~~~~~~~~~~ @@ -81,12 +81,12 @@ have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at checkpoint (or completion) the same path can also be - safely given to \--import-marks. + safely given to --import-marks. --import-marks=<file>:: Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and - must use the same format as produced by \--export-marks. + must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins. @@ -179,8 +179,8 @@ prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure. -Branch updates can be forced with \--force, but it's recommended that -this only be used on an otherwise quiet repository. Using \--force +Branch updates can be forced with --force, but it's recommended that +this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository. @@ -231,11 +231,11 @@ ~~~~~~~~~~~~ The following date formats are supported. A frontend should select the format it will use for this import by passing the format name -in the \--date-format=<fmt> command-line option. +in the --date-format=<fmt> command-line option. `raw`:: This is the Git native format and is `<time> SP <offutc>`. - It is also fast-import's default format, if \--date-format was + It is also fast-import's default format, if --date-format was not specified. + The time of the event is specified by `<time>` as the number of @@ -437,7 +437,7 @@ of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded. The time of the change is specified by `<when>` using the date format -that was selected by the \--date-format=<fmt> command-line option. +that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax. @@ -600,7 +600,7 @@ See `filemodify` above for a detailed description of `<path>`. `filecopy` -^^^^^^^^^^^^ +^^^^^^^^^^ Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced @@ -888,7 +888,7 @@ .... Note that fast-import automatically switches packfiles when the current -packfile reaches \--max-pack-size, or 4 GiB, whichever limit is +packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks. @@ -1226,7 +1226,7 @@ Use One Mark Per Commit ~~~~~~~~~~~~~~~~~~~~~~~ When doing a repository conversion, use a unique mark per commit -(`mark :<n>`) and supply the \--export-marks option on the command +(`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the @@ -1291,7 +1291,7 @@ However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely -large projects (especially if -f and a large \--window parameter is +large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project! @@ -1305,7 +1305,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~ If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying -\--window=50 (or higher) when you run 'git repack'. +--window=50 (or higher) when you run 'git repack'. This will take longer, but will also produce a smaller packfile. You only need to expend the effort once, and everyone using your project will benefit from the smaller repository. @@ -1407,7 +1407,7 @@ fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be -increased or decreased on the command line with \--active-branches=. +increased or decreased on the command line with --active-branches=. per active tree ~~~~~~~~~~~~~~~
diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 93b5067..8680f45 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt
@@ -80,7 +80,7 @@ the things up in .bash_profile). --exec=<git-upload-pack>:: - Same as \--upload-pack=<git-upload-pack>. + Same as --upload-pack=<git-upload-pack>. --depth=<n>:: Limit fetching to ancestor-chains not longer than n.
diff --git a/git-http-backend.html b/git-http-backend.html index 3de098d..3e53144 100644 --- a/git-http-backend.html +++ b/git-http-backend.html
@@ -830,8 +830,8 @@ <div class="sect1"> <h2 id="_examples">EXAMPLES</h2> <div class="sectionbody"> -<div class="paragraph"><p>All of the following examples map <em>http://$hostname/git/foo/bar.git</em> -to <em>/var/www/git/foo/bar.git</em>.</p></div> +<div class="paragraph"><p>All of the following examples map <code>http://$hostname/git/foo/bar.git</code> +to <code>/var/www/git/foo/bar.git</code>.</p></div> <div class="dlist"><dl> <dt class="hdlist1"> Apache 2.x @@ -1069,7 +1069,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-04-09 13:58:25 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-http-backend.txt b/git-http-backend.txt index d422ba4..3ca18c4 100644 --- a/git-http-backend.txt +++ b/git-http-backend.txt
@@ -65,8 +65,8 @@ EXAMPLES -------- -All of the following examples map 'http://$hostname/git/foo/bar.git' -to '/var/www/git/foo/bar.git'. +All of the following examples map `http://$hostname/git/foo/bar.git` +to `/var/www/git/foo/bar.git`. Apache 2.x:: Ensure mod_cgi, mod_alias, and mod_env are enabled, set
diff --git a/git-log.html b/git-log.html index 8788feb..ff036a4 100644 --- a/git-log.html +++ b/git-log.html
@@ -2682,7 +2682,6 @@ <dd> <p> Generate patch (see section on generating patches). - </p> </dd> <dt class="hdlist1"> @@ -2716,7 +2715,6 @@ <dd> <p> Generate the raw format. - </p> </dd> <dt class="hdlist1"> @@ -3610,10 +3608,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
diff --git a/git-pack-objects.txt b/git-pack-objects.txt index c2f76fb..bbea529 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -192,7 +192,7 @@ --shallow:: Optimize a pack that will be provided to a client with a shallow - repository. This option, combined with \--thin, can result in a + repository. This option, combined with --thin, can result in a smaller pack at the cost of speed. --delta-base-offset::
diff --git a/git-push.txt b/git-push.txt index 863c30c..135d810 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -265,8 +265,8 @@ --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The - default is \--verify, giving the hook a chance to prevent the - push. With \--no-verify, the hook is bypassed completely. + default is --verify, giving the hook a chance to prevent the + push. With --no-verify, the hook is bypassed completely. include::urls-remotes.txt[]
diff --git a/git-rebase.html b/git-rebase.html index cd828e1..e81e847 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -814,8 +814,8 @@ remain the checked-out branch.</p></div> <div class="paragraph"><p>If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit -will be skipped. For example, running ‘git rebase master` on the -following history (in which A’ and A introduce the same set of changes, +will be skipped. For example, running <code>git rebase master</code> on the +following history (in which <code>A'</code> and <code>A</code> introduce the same set of changes, but have different committer information):</p></div> <div class="listingblock"> <div class="content"> @@ -1975,7 +1975,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-04-02 14:03:56 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index 47984e8..1d01baa 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -80,7 +80,7 @@ If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the -following history (in which A' and A introduce the same set of changes, +following history (in which `A'` and `A` introduce the same set of changes, but have different committer information): ------------
diff --git a/git-rev-list.txt b/git-rev-list.txt index 5b11922..b10ea60 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt
@@ -9,54 +9,54 @@ SYNOPSIS -------- [verse] -'git rev-list' [ \--max-count=<number> ] - [ \--skip=<number> ] - [ \--max-age=<timestamp> ] - [ \--min-age=<timestamp> ] - [ \--sparse ] - [ \--merges ] - [ \--no-merges ] - [ \--min-parents=<number> ] - [ \--no-min-parents ] - [ \--max-parents=<number> ] - [ \--no-max-parents ] - [ \--first-parent ] - [ \--remove-empty ] - [ \--full-history ] - [ \--not ] - [ \--all ] - [ \--branches[=<pattern>] ] - [ \--tags[=<pattern>] ] - [ \--remotes[=<pattern>] ] - [ \--glob=<glob-pattern> ] - [ \--ignore-missing ] - [ \--stdin ] - [ \--quiet ] - [ \--topo-order ] - [ \--parents ] - [ \--timestamp ] - [ \--left-right ] - [ \--left-only ] - [ \--right-only ] - [ \--cherry-mark ] - [ \--cherry-pick ] - [ \--encoding=<encoding> ] - [ \--(author|committer|grep)=<pattern> ] - [ \--regexp-ignore-case | -i ] - [ \--extended-regexp | -E ] - [ \--fixed-strings | -F ] - [ \--date=(local|relative|default|iso|iso-strict|rfc|short) ] - [ [ \--objects | \--objects-edge | \--objects-edge-aggressive ] - [ \--unpacked ] ] - [ \--pretty | \--header ] - [ \--bisect ] - [ \--bisect-vars ] - [ \--bisect-all ] - [ \--merge ] - [ \--reverse ] - [ \--walk-reflogs ] - [ \--no-walk ] [ \--do-walk ] - [ \--use-bitmap-index ] +'git rev-list' [ --max-count=<number> ] + [ --skip=<number> ] + [ --max-age=<timestamp> ] + [ --min-age=<timestamp> ] + [ --sparse ] + [ --merges ] + [ --no-merges ] + [ --min-parents=<number> ] + [ --no-min-parents ] + [ --max-parents=<number> ] + [ --no-max-parents ] + [ --first-parent ] + [ --remove-empty ] + [ --full-history ] + [ --not ] + [ --all ] + [ --branches[=<pattern>] ] + [ --tags[=<pattern>] ] + [ --remotes[=<pattern>] ] + [ --glob=<glob-pattern> ] + [ --ignore-missing ] + [ --stdin ] + [ --quiet ] + [ --topo-order ] + [ --parents ] + [ --timestamp ] + [ --left-right ] + [ --left-only ] + [ --right-only ] + [ --cherry-mark ] + [ --cherry-pick ] + [ --encoding=<encoding> ] + [ --(author|committer|grep)=<pattern> ] + [ --regexp-ignore-case | -i ] + [ --extended-regexp | -E ] + [ --fixed-strings | -F ] + [ --date=(local|relative|default|iso|iso-strict|rfc|short) ] + [ [ --objects | --objects-edge | --objects-edge-aggressive ] + [ --unpacked ] ] + [ --pretty | --header ] + [ --bisect ] + [ --bisect-vars ] + [ --bisect-all ] + [ --merge ] + [ --reverse ] + [ --walk-reflogs ] + [ --no-walk ] [ --do-walk ] + [ --use-bitmap-index ] <commit>... [ \-- <paths>... ] DESCRIPTION
diff --git a/git-rev-parse.html b/git-rev-parse.html index da177ef..8f49b63 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -907,6 +907,7 @@ </p> <div class="paragraph"><p>If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object +you require, you can add the <code>^{type}</code> peeling operator to the parameter. For example, <code>git rev-parse "$VAR^{commit}"</code> will make sure <code>$VAR</code> names an existing object that is a commit-ish (i.e. a commit, or an annotated tag that points at a commit). To make sure that <code>$VAR</code> @@ -1860,7 +1861,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-05-11 15:40:21 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body> diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 97fc703..c483100 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -102,7 +102,7 @@ + If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object -you require, you can add "\^{type}" peeling operator to the parameter. +you require, you can add the `^{type}` peeling operator to the parameter. For example, `git rev-parse "$VAR^{commit}"` will make sure `$VAR` names an existing object that is a commit-ish (i.e. a commit, or an annotated tag that points at a commit). To make sure that `$VAR` @@ -147,7 +147,7 @@ form as close to the original input as possible. --symbolic-full-name:: - This is similar to \--symbolic, but it omits input that + This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating "heads/master" form, when you want to name the "master" branch when there is an diff --git a/git-send-pack.txt b/git-send-pack.txt index 45c7725..b5d09f7 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt
@@ -29,7 +29,7 @@ a directory on the default $PATH. --exec=<git-receive-pack>:: - Same as \--receive-pack=<git-receive-pack>. + Same as --receive-pack=<git-receive-pack>. --all:: Instead of explicitly specifying which refs to update,
diff --git a/git-show.html b/git-show.html index 17bd829..82386ab 100644 --- a/git-show.html +++ b/git-show.html
@@ -1450,7 +1450,6 @@ <dd> <p> Generate patch (see section on generating patches). - </p> </dd> <dt class="hdlist1"> @@ -1484,7 +1483,6 @@ <dd> <p> Generate the raw format. - </p> </dd> <dt class="hdlist1"> @@ -2378,10 +2376,10 @@ <div class="sect1"> <h2 id="_combined_diff_format">combined diff format</h2> <div class="sectionbody"> -<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to +<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to produce a <em>combined diff</em> when showing a merge. This is the default format when showing merges with <a href="git-diff.html">git-diff(1)</a> or -<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any +<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any of these commands to force generation of diffs with individual parents of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div> @@ -2642,7 +2640,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-show.txt b/git-show.txt index 4e617e6..82a4125 100644 --- a/git-show.txt +++ b/git-show.txt
@@ -22,7 +22,7 @@ For tags, it shows the tag message and the referenced objects. For trees, it shows the names (equivalent to 'git ls-tree' -with \--name-only). +with --name-only). For plain blobs, it shows the plain contents.
diff --git a/git-stripspace.txt b/git-stripspace.txt index 6c6e989..60328d5 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt
@@ -49,7 +49,7 @@ Given the following noisy input with '$' indicating the end of a line: --------- +--------- |A brief introduction $ | $ |$ @@ -65,7 +65,7 @@ Use 'git stripspace' with no arguments to obtain: --------- +--------- |A brief introduction$ |$ |A new paragraph$ @@ -79,7 +79,7 @@ Use 'git stripspace --strip-comments' to obtain: --------- +--------- |A brief introduction$ |$ |A new paragraph$
diff --git a/git-svn.html b/git-svn.html index 23e47f8..b80e8b2 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -873,8 +873,8 @@ <p> For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other - transports (e.g. svn+ssh://), you must include the username in - the URL, e.g. svn+ssh://foo@svn.bar.com/project + transports (e.g. <code>svn+ssh://</code>), you must include the username in + the URL, e.g. <code>svn+ssh://foo@svn.bar.com/project</code> </p> </dd> <dt class="hdlist1"> @@ -1201,10 +1201,9 @@ Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer "yes" (accept this patch), "no" (discard this patch), "all" (accept all patches), or "quit". - <br /> - <em>git svn dcommit</em> returns immediately if answer is "no" or "quit", without - committing anything to SVN. </p> +<div class="paragraph"><p><em>git svn dcommit</em> returns immediately if answer is "no" or "quit", without +committing anything to SVN.</p></div> </dd> </dl></div> </dd> @@ -2404,7 +2403,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-11-04 14:37:41 PST +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index 39e9a18..11d1e2f 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -70,8 +70,8 @@ --username=<user>;; For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other - transports (e.g. svn+ssh://), you must include the username in - the URL, e.g. svn+ssh://foo@svn.bar.com/project + transports (e.g. `svn+ssh://`), you must include the username in + the URL, e.g. `svn+ssh://foo@svn.bar.com/project` --prefix=<prefix>;; This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are @@ -279,9 +279,9 @@ Ask the user to confirm that a patch set should actually be sent to SVN. For each patch, one may answer "yes" (accept this patch), "no" (discard this patch), "all" (accept all patches), or "quit". - + - 'git svn dcommit' returns immediately if answer is "no" or "quit", without - committing anything to SVN. ++ +'git svn dcommit' returns immediately if answer is "no" or "quit", without +committing anything to SVN. 'branch':: Create a branch in the SVN repository.
diff --git a/git-tag.html b/git-tag.html index 313019b..71a5a10 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -1004,7 +1004,7 @@ <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> <div class="paragraph"><p>By default, <em>git tag</em> in sign-with-default mode (-s) will use your -committer identity (of the form "Your Name <your@email.address>") to +committer identity (of the form <code>Your Name <your@email.address></code>) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:</p></div> <div class="listingblock"> @@ -1219,7 +1219,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2015-04-28 15:47:21 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-tag.txt b/git-tag.txt index f5b267e..034d10d 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -158,7 +158,7 @@ CONFIGURATION ------------- By default, 'git tag' in sign-with-default mode (-s) will use your -committer identity (of the form "Your Name <\your@email.address>") to +committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:
diff --git a/git-unpack-objects.html b/git-unpack-objects.html index ec1550c..5e6b86e 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html
@@ -748,7 +748,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] < <pack-file></pre> +<pre class="content"><em>git unpack-objects</em> [-n] [-q] [-r] [--strict] < <packfile></pre> <div class="attribution"> </div></div> </div> @@ -760,8 +760,8 @@ the objects contained within and writing them into the repository in "loose" (one object per file) format.</p></div> <div class="paragraph"><p>Objects that already exist in the repository will <strong>not</strong> be unpacked -from the pack-file. Therefore, nothing will be unpacked if you use -this command on a pack-file that exists within the target repository.</p></div> +from the packfile. Therefore, nothing will be unpacked if you use +this command on a packfile that exists within the target repository.</p></div> <div class="paragraph"><p>See <a href="git-repack.html">git-repack(1)</a> for options to generate new packs and replace existing ones.</p></div> </div> @@ -820,7 +820,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-11-04 16:39:52 PST +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index 12cb108..07d4329 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt
@@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] -'git unpack-objects' [-n] [-q] [-r] [--strict] < <pack-file> +'git unpack-objects' [-n] [-q] [-r] [--strict] < <packfile> DESCRIPTION @@ -19,8 +19,8 @@ "loose" (one object per file) format. Objects that already exist in the repository will *not* be unpacked -from the pack-file. Therefore, nothing will be unpacked if you use -this command on a pack-file that exists within the target repository. +from the packfile. Therefore, nothing will be unpacked if you use +this command on a packfile that exists within the target repository. See linkgit:git-repack[1] for options to generate new packs and replace existing ones.
diff --git a/git-verify-pack.html b/git-verify-pack.html index ee9c200..f324664 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html
@@ -814,7 +814,7 @@ <div class="paragraph"><p>When specifying the -v option the format used is:</p></div> <div class="literalblock"> <div class="content"> -<pre><code>SHA-1 type size size-in-pack-file offset-in-packfile</code></pre> +<pre><code>SHA-1 type size size-in-packfile offset-in-packfile</code></pre> </div></div> <div class="paragraph"><p>for objects that are not deltified in the pack, and</p></div> <div class="literalblock"> @@ -834,7 +834,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-08-20 08:40:27 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 526ba7b..61ca6d0 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt
@@ -40,7 +40,7 @@ ------------- When specifying the -v option the format used is: - SHA-1 type size size-in-pack-file offset-in-packfile + SHA-1 type size size-in-packfile offset-in-packfile for objects that are not deltified in the pack, and
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index 8475c07..36e9ab3 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt
@@ -259,7 +259,7 @@ @@ -1 +1,2 @@ Hello World +It's a new day for git ----- +------------ i.e. the diff of the change we caused by adding another line to `hello`.
diff --git a/gitdiffcore.txt b/gitdiffcore.txt index c8b3e51..c579593 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt
@@ -28,8 +28,8 @@ files: - 'git diff-index' compares contents of a "tree" object and the - working directory (when '\--cached' flag is not used) or a - "tree" object and the index file (when '\--cached' flag is + working directory (when '--cached' flag is not used) or a + "tree" object and the index file (when '--cached' flag is used); - 'git diff-files' compares contents of the index file and the @@ -142,7 +142,7 @@ When the "-C" option is used, the original contents of modified files, and deleted files (and also unmodified files, if the -"\--find-copies-harder" option is used) are considered as candidates +"--find-copies-harder" option is used) are considered as candidates of the source files in rename/copy operation. If the input were like these filepairs, that talk about a modified file fileY and a newly created file file0:
diff --git a/gitremote-helpers.txt b/gitremote-helpers.txt index 8edf72c..82e2d15 100644 --- a/gitremote-helpers.txt +++ b/gitremote-helpers.txt
@@ -408,14 +408,14 @@ of <n> correspond to the number of -v flags passed on the command line. -'option progress' \{'true'|'false'\}:: +'option progress' {'true'|'false'}:: Enables (or disables) progress messages displayed by the transport helper during a command. 'option depth' <depth>:: Deepens the history of a shallow repository. -'option followtags' \{'true'|'false'\}:: +'option followtags' {'true'|'false'}:: If enabled the helper should automatically fetch annotated tag objects if the object the tag points at was transferred during the fetch command. If the tag is not fetched by @@ -423,7 +423,7 @@ ask for the tag specifically. Some helpers may be able to use this option to avoid a second network connection. -'option dry-run' \{'true'|'false'\}: +'option dry-run' {'true'|'false'}: If true, pretend the operation completed successfully, but don't actually change any repository data. For most helpers this only applies to the 'push', if supported. @@ -434,18 +434,18 @@ must not rely on this option being set before connect request occurs. -'option check-connectivity' \{'true'|'false'\}:: +'option check-connectivity' {'true'|'false'}:: Request the helper to check connectivity of a clone. -'option force' \{'true'|'false'\}:: +'option force' {'true'|'false'}:: Request the helper to perform a force update. Defaults to 'false'. -'option cloning \{'true'|'false'\}:: +'option cloning {'true'|'false'}:: Notify the helper this is a clone request (i.e. the current repository is guaranteed empty). -'option update-shallow \{'true'|'false'\}:: +'option update-shallow {'true'|'false'}:: Allow to extend .git/shallow if the new refs require it. SEE ALSO diff --git a/technical/pack-protocol.html b/technical/pack-protocol.html index 001ddd2..ab3e733 100644 --- a/technical/pack-protocol.html +++ b/technical/pack-protocol.html
@@ -1217,7 +1217,7 @@ references.</p></div> <div class="listingblock"> <div class="content"> -<pre><code> update-request = *shallow ( command-list | push-cert ) [pack-file] +<pre><code> update-request = *shallow ( command-list | push-cert ) [packfile] shallow = PKT-LINE("shallow" SP obj-id LF) @@ -1243,7 +1243,7 @@ *PKT-LINE(gpg-signature-lines LF) PKT-LINE("push-cert-end" LF) - pack-file = "PACK" 28*(OCTET)</code></pre> + packfile = "PACK" 28*(OCTET)</code></pre> </div></div> <div class="paragraph"><p>If the receiving end does not support delete-refs, the sending end MUST NOT ask for delete command.</p></div> @@ -1251,10 +1251,10 @@ MUST NOT send a push-cert command. When a push-cert command is sent, command-list MUST NOT be sent; the commands recorded in the push certificate is used instead.</p></div> -<div class="paragraph"><p>The pack-file MUST NOT be sent if the only command used is <em>delete</em>.</p></div> -<div class="paragraph"><p>A pack-file MUST be sent if either create or update command is used, +<div class="paragraph"><p>The packfile MUST NOT be sent if the only command used is <em>delete</em>.</p></div> +<div class="paragraph"><p>A packfile MUST be sent if either create or update command is used, even if the server already has all the necessary objects. In this -case the client MUST send an empty pack-file. The only time this +case the client MUST send an empty packfile. The only time this is likely to happen is if the client is creating a new branch or a tag that points to an existing obj-id.</p></div> <div class="paragraph"><p>The server will receive the packfile, unpack it, then validate each @@ -1363,7 +1363,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2014-10-14 15:27:06 PDT +Last updated 2015-05-22 13:47:07 PDT </div> </div> </body> diff --git a/technical/pack-protocol.txt b/technical/pack-protocol.txt index 462e206..fc09c63 100644 --- a/technical/pack-protocol.txt +++ b/technical/pack-protocol.txt
@@ -465,7 +465,7 @@ references. ---- - update-request = *shallow ( command-list | push-cert ) [pack-file] + update-request = *shallow ( command-list | push-cert ) [packfile] shallow = PKT-LINE("shallow" SP obj-id LF) @@ -491,7 +491,7 @@ *PKT-LINE(gpg-signature-lines LF) PKT-LINE("push-cert-end" LF) - pack-file = "PACK" 28*(OCTET) + packfile = "PACK" 28*(OCTET) ---- If the receiving end does not support delete-refs, the sending end MUST @@ -502,11 +502,11 @@ sent, command-list MUST NOT be sent; the commands recorded in the push certificate is used instead. -The pack-file MUST NOT be sent if the only command used is 'delete'. +The packfile MUST NOT be sent if the only command used is 'delete'. -A pack-file MUST be sent if either create or update command is used, +A packfile MUST be sent if either create or update command is used, even if the server already has all the necessary objects. In this -case the client MUST send an empty pack-file. The only time this +case the client MUST send an empty packfile. The only time this is likely to happen is if the client is creating a new branch or a tag that points to an existing obj-id. 